9886c29eade39f5766ddd2defa83eb3c0f9bebf7,plugins/IntentionPowerPak/src/com/siyeh/ipp/constant/ConstantExpressionPredicate.java,ConstantExpressionPredicate,satisfiedBy,#PsiElement#,26
Before Change
}
final PsiElement parent = element.getParent();
return !(parent instanceof PsiExpression &&
PsiUtil.isConstantExpression((PsiExpression)parent));
}
}
After Change
}
final PsiExpression[] operands = expression.getOperands();
for (PsiExpression operand : operands) {
if (operand == null) {
return false;
}
final PsiType type = operand.getType();
if (type == null || type.equalsToText("java.lang.String")) {
return false;
}
}
if (!PsiUtil.isConstantExpression(expression)) {
return false;
}
try {
final Object value = ExpressionUtils.computeConstantExpression(expression, true);
if (value == null) {
return false;
}
}
catch (ConstantEvaluationOverflowException ignore) {
return false;
}
final PsiElement parent = element.getParent();
return !(parent instanceof PsiExpression) || !PsiUtil.isConstantExpression((PsiExpression)parent);
}
}